Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:20:36 +0000 (14:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:20:36 +0000 (14:20 -0700)
commit4492a061eae45ee3a52fccf6bb02cc2acff8bcb6
tree70290ea103798844fb08f6ff3b5900f0d5d98511
parentba81f1a612e3783bd9cbba93584005d57be39224
parentf9d128d22c24d4b8817e01130b4ce72bdf628bdd
Merge from trunk.
src/ChangeLog
src/bidi.c
src/cmds.c
src/dispnew.c
src/eval.c
src/image.c
src/process.c
src/xdisp.c